From b728e2eaba37c44ca93072b4153739de13495f67 Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Thu, 20 Sep 2001 16:31:21 +0000 Subject: [PATCH] configure.in gdk/Makefile.am gtk/Makefile.am gtk/gtkselection.c 2001-09-20 Sven Neumann * configure.in * gdk/Makefile.am * gtk/Makefile.am * gtk/gtkselection.c * gtk/gtktreeview.c * gtk/gtkwindow.c: removed remaining traces of nanox GDK backend. --- ChangeLog | 9 +++++++++ ChangeLog.pre-2-0 | 9 +++++++++ ChangeLog.pre-2-10 | 9 +++++++++ ChangeLog.pre-2-2 | 9 +++++++++ ChangeLog.pre-2-4 | 9 +++++++++ ChangeLog.pre-2-6 | 9 +++++++++ ChangeLog.pre-2-8 | 9 +++++++++ configure.in | 26 +++++--------------------- gdk/Makefile.am | 12 +----------- gtk/Makefile.am | 7 +------ gtk/gtkselection.c | 2 -- gtk/gtktreeview.c | 2 -- gtk/gtkwindow.c | 2 -- 13 files changed, 70 insertions(+), 44 deletions(-) diff --git a/ChangeLog b/ChangeLog index c3c3a20d80..2f6a1fa6c7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2001-09-20 Sven Neumann + + * configure.in + * gdk/Makefile.am + * gtk/Makefile.am + * gtk/gtkselection.c + * gtk/gtktreeview.c + * gtk/gtkwindow.c: removed remaining traces of nanox GDK backend. + Thu Sep 20 11:19:42 2001 Owen Taylor * gdk/gdkpango.c (gdk_pango_layout_line_get_clip_region): Add diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index c3c3a20d80..2f6a1fa6c7 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,12 @@ +2001-09-20 Sven Neumann + + * configure.in + * gdk/Makefile.am + * gtk/Makefile.am + * gtk/gtkselection.c + * gtk/gtktreeview.c + * gtk/gtkwindow.c: removed remaining traces of nanox GDK backend. + Thu Sep 20 11:19:42 2001 Owen Taylor * gdk/gdkpango.c (gdk_pango_layout_line_get_clip_region): Add diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c3c3a20d80..2f6a1fa6c7 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +2001-09-20 Sven Neumann + + * configure.in + * gdk/Makefile.am + * gtk/Makefile.am + * gtk/gtkselection.c + * gtk/gtktreeview.c + * gtk/gtkwindow.c: removed remaining traces of nanox GDK backend. + Thu Sep 20 11:19:42 2001 Owen Taylor * gdk/gdkpango.c (gdk_pango_layout_line_get_clip_region): Add diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index c3c3a20d80..2f6a1fa6c7 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,12 @@ +2001-09-20 Sven Neumann + + * configure.in + * gdk/Makefile.am + * gtk/Makefile.am + * gtk/gtkselection.c + * gtk/gtktreeview.c + * gtk/gtkwindow.c: removed remaining traces of nanox GDK backend. + Thu Sep 20 11:19:42 2001 Owen Taylor * gdk/gdkpango.c (gdk_pango_layout_line_get_clip_region): Add diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index c3c3a20d80..2f6a1fa6c7 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,12 @@ +2001-09-20 Sven Neumann + + * configure.in + * gdk/Makefile.am + * gtk/Makefile.am + * gtk/gtkselection.c + * gtk/gtktreeview.c + * gtk/gtkwindow.c: removed remaining traces of nanox GDK backend. + Thu Sep 20 11:19:42 2001 Owen Taylor * gdk/gdkpango.c (gdk_pango_layout_line_get_clip_region): Add diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index c3c3a20d80..2f6a1fa6c7 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,12 @@ +2001-09-20 Sven Neumann + + * configure.in + * gdk/Makefile.am + * gtk/Makefile.am + * gtk/gtkselection.c + * gtk/gtktreeview.c + * gtk/gtkwindow.c: removed remaining traces of nanox GDK backend. + Thu Sep 20 11:19:42 2001 Owen Taylor * gdk/gdkpango.c (gdk_pango_layout_line_get_clip_region): Add diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index c3c3a20d80..2f6a1fa6c7 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +2001-09-20 Sven Neumann + + * configure.in + * gdk/Makefile.am + * gtk/Makefile.am + * gtk/gtkselection.c + * gtk/gtktreeview.c + * gtk/gtkwindow.c: removed remaining traces of nanox GDK backend. + Thu Sep 20 11:19:42 2001 Owen Taylor * gdk/gdkpango.c (gdk_pango_layout_line_get_clip_region): Add diff --git a/configure.in b/configure.in index 7c430f4888..ec143158cc 100644 --- a/configure.in +++ b/configure.in @@ -131,13 +131,13 @@ AC_ARG_WITH(xinput, [ --with-xinput=[no/gxi/xfree] support XInput ]) gdktarget=x11 gdktargetlib=libgdk-x11-1.3.la gtktargetlib=libgtk-x11-1.3.la -AC_ARG_WITH(gdktarget, [ --with-gdktarget=[x11/nanox/linux-fb] select GDK target [default=x11] ], +AC_ARG_WITH(gdktarget, [ --with-gdktarget=[x11/linux-fb] select GDK target [default=x11] ], gdktarget=$with_gdktarget) AC_SUBST(gdktarget) case $gdktarget in - x11|nanox|linux-fb) ;; - *) AC_MSG_ERROR([Invalid target for GDK: use x11, nanox or linux-fb.]);; + x11|linux-fb) ;; + *) AC_MSG_ERROR([Invalid target for GDK: use x11 or linux-fb.]);; esac AC_ARG_ENABLE(shadowfb, [ --disable-shadowfb disable shadowfb support for linux-fb],,enable_shadowfb=yes) @@ -831,19 +831,6 @@ AC_SUBST(GDK_PIXBUF_XLIB_EXTRA_CFLAGS) AC_SUBST(GDK_PIXBUF_XLIB_DEP_LIBS) AC_SUBST(GDK_PIXBUF_XLIB_DEP_CFLAGS) -if test "x$gdktarget" = "xnanox"; then - AC_CHECK_LIB(nano-X, GrOpen,,AC_MSG_ERROR([nano-X libraries not found.])) - # nano-X may require additional libraries - GDK_EXTRA_LIBS="-lnano-X $GDK_EXTRA_LIBS" - - gdktargetlib="libgdk-nanox-1.3.la" - gtktargetlib="libgtk-nanox-1.3.la" - - AM_CONDITIONAL(USE_NANOX, true) -else - AM_CONDITIONAL(USE_NANOX, false) -fi - if test "x$gdktarget" = "xlinux-fb"; then gdktargetlib="libgdk-linux-fb-1.3.la" gtktargetlib="libgtk-linux-fb-1.3.la" @@ -983,7 +970,7 @@ AC_SUBST(GTK_XIM_FLAGS) # Checks for gtk-doc and docbook-tools ################################################## -AC_ARG_WITH(html-dir, [ --with-html-dir=PATH path to installed docs ]) +AC_ARG_WITH(html-dir, [ --with-html-dir=PATH path to installed docs ]) if test "x$with_html_dir" = "x" ; then HTML_DIR='${datadir}/gtk-doc/html' @@ -1014,7 +1001,7 @@ AC_CHECK_PROG(DB2HTML, db2html, true, false) AM_CONDITIONAL(HAVE_DOCBOOK, $DB2HTML) dnl Let people disable the gtk-doc stuff. -AC_ARG_ENABLE(gtk-doc, [ --enable-gtk-doc Use gtk-doc to build documentation [default=auto]], enable_gtk_doc="$enableval", enable_gtk_doc=auto) +AC_ARG_ENABLE(gtk-doc, [ --enable-gtk-doc Use gtk-doc to build documentation [default=auto]], enable_gtk_doc="$enableval", enable_gtk_doc=auto) if test x$enable_gtk_doc = xauto ; then if test x$GTKDOC = xtrue ; then @@ -1094,9 +1081,6 @@ esac if test "x$gdktarget" = "xx11" ; then gdk_windowing=' #define GDK_WINDOWING_X11' -elif test "x$gdktarget" = "xnanox" ; then - gdk_windowing=' -#define GDK_WINDOWING_NANOX' elif test "x$gdktarget" = "xlinux-fb" ; then gdk_windowing=' #define GDK_WINDOWING_FB diff --git a/gdk/Makefile.am b/gdk/Makefile.am index e17cc1c693..a36f36afc0 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -117,16 +117,6 @@ libgdk_x11_include_HEADERS = $(gdk_headers) libgdk_x11_1_3_la_SOURCES = $(gdk_c_sources) gdkenumtypes.c endif -if USE_NANOX -libgdk_nanox_includedir = $(includedir)/gtk-2.0/gdk - -libgdk_nanox_1_3_la_LIBADD = \ - $(gtarget)/libgdk-$(gtarget).la - -libgdk_nanox_include_HEADERS = $(gdk_headers) -libgdk_nanox_1_3_la_SOURCES = $(gdk_c_sources) gdkenumtypes.c -endif - if USE_LINUX_FB libgdk_linux_fb_includedir = $(includedir)/gtk-2.0/gdk @@ -140,7 +130,7 @@ endif # now define the real one to workaround automake's mishandling lib_LTLIBRARIES = $(extra) -EXTRA_LTLIBRARIES = libgdk-x11-1.3.la libgdk-nanox-1.3.la libgdk-linux-fb-1.3.la +EXTRA_LTLIBRARIES = libgdk-x11-1.3.la libgdk-linux-fb-1.3.la MAINTAINERCLEANFILES = EXTRA_HEADERS = diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 831acc91fc..637db46165 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -500,17 +500,12 @@ libgtk_x11_includedir = $(includedir)/gtk-2.0/gtk libgtk_x11_include_HEADERS = $(gtk_target_headers) libgtk_x11_1_3_la_SOURCES = $(gtk_target_sources) endif -if USE_NANOX -libgtk_nanox_includedir = $(includedir)/gtk-2.0/gtk -libgtk_nanox_include_HEADERS = $(gtk_target_headers) -libgtk_nanox_1_3_la_SOURCES = $(gtk_target_sources) -endif if USE_LINUX_FB libgtk_linux_fb_includedir = $(includedir)/gtk-2.0/gtk libgtk_linux_fb_include_HEADERS = $(gtk_target_headers) libgtk_linux_fb_1_3_la_SOURCES = $(gtk_target_sources) endif -EXTRA_LTLIBRARIES = libgtk-x11-1.3.la libgtk-nanox-1.3.la libgtk-linux-fb-1.3.la +EXTRA_LTLIBRARIES = libgtk-x11-1.3.la libgtk-linux-fb-1.3.la # We create a dummy theme for the default GTK+ theme diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c index 0e670919a4..e399fbc69a 100644 --- a/gtk/gtkselection.c +++ b/gtk/gtkselection.c @@ -61,8 +61,6 @@ #include "win32/gdkwin32.h" /* For gdk_window_lookup() */ #elif defined (GDK_WINDOWING_FB) #include "linux-fb/gdkfb.h" /* For gdk_window_lookup() */ -#elif defined (GDK_WINDOWING_NANOX) -#include "nanox/gdkprivate-nanox.h" /* For gdk_window_lookup() */ #endif #include "gtkmain.h" diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 5e5413af81..9b6366e3c8 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -44,8 +44,6 @@ #include "win32/gdkwin32.h" #elif defined(GDK_WINDOWING_FB) #include "linux-fb/gdkfb.h" -#elif defined (GDK_WINDOWING_NANOX) -#include "nanox/gdkprivate-nanox.h" #endif diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index 236ba28138..6b0515f149 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -33,8 +33,6 @@ #include "x11/gdkx.h" #elif defined (GDK_WINDOWING_WIN32) #include "win32/gdkwin32.h" -#elif defined (GDK_WINDOWING_NANOX) -#include "nanox/gdkprivate-nanox.h" #elif defined (GDK_WINDOWING_FB) #include "linux-fb/gdkfb.h" #endif -- 2.30.2